project restructured to reduce number of files