Split into directories, naming still using A and K for now. Strange __init__.py files appeared in new directories.