improved file structure, removed old files