Started reorganizing the sources
More file reorganizations