moving element to top level
Adding missing files
Big refactor.