removing unused code; simplified folder structure