Some configuration changes
Structure and script changes
Delete not needed files