Added a test project, removed some old classes to prepare for new implementation