Moved around files to fit structure