massive restructuring
removed some excess files