Cleaned up Source folder