Changed file layout for the better....