Small Formatting changes.
Fix empty list checks
Splitting up the project into its constituent parts
this one should be sufficient with no conflicts

this fixes bracing/spacing errors