Cleaned up

Files are more organized and look cleaner for user modifications.