Rearranged Directory Structure, prepared API data transfer