Updates

Change File Structure
Updated emitters to be more similar in structure
Remove classes in wrong structure