Deleted misc. files and cleaned up structure