Added the floating shapes and rearranged files