Move class to their own files
Bug fixes