formatting and project structure updates