Reorganized files. Base path is current working dir.