Improved "src" subdirectory structure