Moved files to src. Updated tests and fixed bug.