Folders sorted

Resorted the folders and files
Working version

Basic functions seem to work. So far only adding one instance of each
object with no further operations.