Refactored folder structure for spec files, improved requires in files