Moved things into folders. The imports look a little funny and will have to be cleaned up in the future.