Some changes in coding style. Categorization in folders.