Restructure folders, refactor variables