re-arrange files
nearly finish the prototype