Moved files for a better layout and added test target.