Add tests and move files into source folder