Changing file structure
Building structure and adding core classes