Doing what I intended to do correctly this time, moving all my software sources into the software folder.
