changing to own project structure