Files moved to folders, some code optimization