restructure files/folders into better organization