Line width issues
Move files from "src/private" to "src"