Grouped all modules together, attempting a much cleaner file structure
Attempt to break down dependencies