moved to freedom.json files and added module declarations and some cleanup