Restructring the project.
errors removal