Organizing my project a lil more