Clean project structure #70