Moved elements to separate file