Organized Files and Namespaces

Also removed junk files