Restructure src directory (consolidate with specs)