project structure tied up, useless classes now in 'legacy' package