cleanup
file structure updates