updates to structure and functionality
fully removes older file