Moving some files arround
Removing entities interfaces