fixed project structure + got tests working