move definitions to new folder
resync include paths
delete