Moved files. Added first test