Clean up src directory a bit