Rearranged the files and took the new optimization into use