Cleaned up code. Moved files to directory