Rearranged files and added test project