Cleaned up a little bit, added missing source files