Moved actual code to subfolder (and cleaned up)