Feature/project restructure