Cleaned up source tree