reorganized structure, removed files not needed