Reordered files and cleaned up a bit