More tests to check functionality
Restructured folders