Cleaned up the source tree a bit