Rearranging project files and adding Spec Test