Restructured project and removed autogenerated junk