Added test project, little folder structure upgrade