project structure amendments
filter todo
remove reference to legacy code