Move activities into lib directory