Structure refactoring. Added test folders, to temporary files