project main structure changed to separate program as standalone modules
some files renamed