Aesthetic fixes
Make subroutines polymorphic, merge all projects into one