Cleaned build directory

Got rid of a bunch of build directory stuff and reconfigured file structure a bit