project files rearranged
fix path once more
rearrange paths