changed the layout of the source code and other stuff