folder rearranged and added automake