Changed organization, and organized files