Refactors to account for project restructure/rename