Fixed naming conventions and added tabs to all modules