Loading and some little changes. Deleted deprecated files