Refactored files ot make extension piece more obvious.