moved src files to own src folder, refactored tests and repaired ignored specs