layer refactor to support flash based ui
renamed some files