changed project structure to be non-intrusive