Rearranged main file, let's rock