Cleaned the src directory a bit