cleaned everything up and moved into modules
deleted unnecessary files after modularizing stuff