Modified structure of the project

Now it has the same style across the whole project