Rearranged files again and corrected issues with splash page