Some changes in structure of project

I made some minor changes in the structure of the package. For best usability on projects. This structure better fits the standards of other large projects.