Made layers modular, added convolutional layers