Move locale to app dir, small fix in time calculcation