Code style and structure#

Under development