Rearranged the folder structure to simplify future builds
Version 3.2.1 Update