Adding tests
Fixed folder structure