Removed unnecessary junk; restructured project