Removed sys folder - planning on a new layout