Files restructured for proper amber 0.12