Fixed folder structure

Fixed folder structure and the beginnings of a proper structure to the
code.