Added test project
Rearranged project