Cleaned up file structure, made more folders