Changed file structure to comply with module/lib standards