Refactored and moved files to root