Moved out classes from files and namespace refac