Updated directory structure

Reorganized directories, edited make file
Added/altered the listing functions