move files for better submodule integration
update paths