Reorganize files

Various changes to fulfill #81