changed library structure and added aloha settings in external file