Moved the code out of the top level directory