restructured project and files