Moved classes to different files, debugging...