Updated structure, stripped down project