Restructured file hierarchy and refactored unit