new code for refactored project, and some removed files