Restructured the source directory a bit